Merge "Avoid preemptive DB replication waits for farm cross-wiki redirects"

diff --combined includes/DefaultSettings.php
index 5d95964,d525816..44461b3
--- 1/includes/DefaultSettings.php
--- 2/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@@ -755,8 -755,6 +755,8 @@@ $wgCopyUploadProxy = false
   * timeout longer than the default $wgHTTPTimeout. False means fallback
   * to default.
   *
 + * @var int|bool
 + *
   * @since 1.22
   */
  $wgCopyUploadTimeout = false;
@@@ -2055,8 -2053,8 +2055,8 @@@ $wgDBmysql5 = false
  $wgDBOracleDRCP = false;
  
  /**
-  * Other wikis on this site, can be administered from a single developer
-  * account.
+  * Other wikis on this site, can be administered from a single developer account.
+  *
   * Array numeric key => database name
   */
  $wgLocalDatabases = [];
@@@ -3237,6 -3235,14 +3237,6 @@@ $wgHTMLFormAllowTableFormat = true
   */
  $wgUseMediaWikiUIEverywhere = false;
  
 -/**
 - * Temporary variable that determines whether the EditPage class should use OOjs UI or not.
 - * This will be removed later and OOjs UI will become the only option.
 - *
 - * @since 1.29
 - */
 -$wgOOUIEditPage = true;
 -
  /**
   * Whether to label the store-to-database-and-show-to-others button in the editor
   * as "Save page"/"Save changes" if false (the default) or, if true, instead as
@@@ -8273,7 -8279,6 +8273,7 @@@ $wgShellLocale = 'C.UTF-8'
  
  /**
   * Timeout for HTTP requests done internally, in seconds.
 + * @var int
   */
  $wgHTTPTimeout = 25;
  
@@@ -8303,8 -8308,6 +8303,6 @@@ $wgHTTPProxy = false
   *   subdomain thereof, then no proxy will be used.
   *   Command-line scripts are not affected by this setting and will always use
   *   the proxy if it is configured.
-  * - ChronologyProtector: Decide to shutdown LBFactory asynchronously instead
-  *   synchronously if the current response redirects to a local virtual host.
   *
   * @since 1.25
   */